Allow http://user:pass@foo/ URLs again

* lisp/url/url-auth.el (url-basic-auth): Allow explicit
user/passwords in URLs (bug#19046).

Backport:

(cherry picked from commit b563715a2db265517d5a77f165a42afa1e233fdd)

diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 31c15329ac6bbd55d84260ed2d72d933f9157758..75a9e3878474cdd3761d8016fa725fb2db1e596d 100644 (file)
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -80,6 +80,9 @@ instead of the filename inheritance method."
          byserv (cdr-safe (assoc server
                                  (symbol-value url-basic-auth-storage))))
     (cond
+     ((and user pass)
+      ;; Explicit http://user:pass@foo/ URL.  Just return the credentials.
+      (setq retval (base64-encode-string (format "%s:%s" user pass))))
      ((and prompt (not byserv))
       (setq user (or
                  (url-do-auth-source-search server type :user)